Separating DataProvider into a separate Class